mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ 2012-04-23 04:03:17 +00:00 • committed by admin
parent cd8934e4a2
commit 450201dcee
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/forum/What_can_be_done_in_case_of_conflict.mdwn Normal file
View file

@ -0,0 +1,7 @@
Hi,
How can I resolve the conflict when it occurs?
Suppose I have 2 branches (master, current), When I merge these branches or while doing cherry-pick, if I get conflict how can I resolve it?
Thank You