message no. 83126
Posted by parkwow13 in #github at 2015-03-10T08:24:24Z
excuse me. i have one.txt two.txt three.txt , after i made branch 'testprogit' and checkout to this. i remove one.txt to testprogit and commit. then i merge master from testprogit. but conflict one.txt. i want not remove one.txt to master. and i want not create to testprogit. how solve this?