Resolving merge conflicts in Git: Revision history

24 August 2016

• curprev 22:5422:54, 24 August 2016‎ Brian Lee talk contribs‎ 9,610 bytes +815‎ Adding link info to a repository to test having a merge conflict.

17 April 2012

• curprev 21:1221:12, 17 April 2012‎ Kuhn talk contribs‎ 8,795 bytes −1‎ →‎Git can fail during the merge
• curprev 19:4619:46, 17 April 2012‎ Kuhn talk contribs‎ 8,796 bytes +17‎ No edit summary

12 October 2011

• curprev 20:3620:36, 12 October 2011‎ Vsmalladi talk contribs‎ m 8,779 bytes +34‎ →‎What do I do after I've resolved conflicts in all affected files?

26 September 2011

• curprev 20:2320:23, 26 September 2011‎ Chinhli talk contribs‎ 8,745 bytes +6‎ →‎What do I do after I've resolved conflicts in all affected files?
• curprev 20:2220:22, 26 September 2011‎ Chinhli talk contribs‎ 8,739 bytes +88‎ →‎What do I do after I've resolved conflicts in all affected files?

3 March 2011

• curprev 00:4400:44, 3 March 2011‎ Marygoldman talk contribs‎ 8,651 bytes +172‎ →‎Tools specifically for when git refuses to start merge
• curprev 00:4200:42, 3 March 2011‎ Marygoldman talk contribs‎ 8,479 bytes +61‎ →‎git reset
• curprev 00:4000:40, 3 March 2011‎ Marygoldman talk contribs‎ 8,418 bytes +13‎ →‎git status
• curprev 00:3900:39, 3 March 2011‎ Marygoldman talk contribs‎ 8,405 bytes 0‎ →‎How do I know which files have conflicts in them?
• curprev 00:3900:39, 3 March 2011‎ Marygoldman talk contribs‎ 8,405 bytes +13‎ →‎How do I know which files have conflicts in them?
• curprev 00:3600:36, 3 March 2011‎ Marygoldman talk contribs‎ 8,392 bytes +114‎ →‎Git can fail during the merge
• curprev 00:3600:36, 3 March 2011‎ Marygoldman talk contribs‎ 8,278 bytes −18‎ →‎Git can fail to start the merge
• curprev 00:3500:35, 3 March 2011‎ Marygoldman talk contribs‎ 8,296 bytes +170‎ →‎Git can fail to start the merge
• curprev 00:3200:32, 3 March 2011‎ Marygoldman talk contribs‎ 8,126 bytes −397‎ →‎git stash

2 March 2011

• curprev 21:4321:43, 2 March 2011‎ Marygoldman talk contribs‎ 8,523 bytes +95‎ →‎General tools
• curprev 21:4121:41, 2 March 2011‎ Marygoldman talk contribs‎ 8,428 bytes +15‎ →‎Tools specifically for when git conflicts arise during a merge
• curprev 21:3521:35, 2 March 2011‎ Marygoldman talk contribs‎ 8,413 bytes −46‎ →‎git checkout
• curprev 21:3321:33, 2 March 2011‎ Marygoldman talk contribs‎ 8,459 bytes +2‎ →‎How do I find conflicts within the file itself?
• curprev 21:3221:32, 2 March 2011‎ Marygoldman talk contribs‎ 8,457 bytes +23‎ →‎How do I know which files have conflicts in them?
• curprev 21:2621:26, 2 March 2011‎ Marygoldman talk contribs‎ 8,434 bytes −2‎ →‎Two ways git merge/git pull can fail
• curprev 21:2021:20, 2 March 2011‎ Marygoldman talk contribs‎ 8,436 bytes +37‎ →‎Git refuses to start a merge/pull
• curprev 21:1921:19, 2 March 2011‎ Marygoldman talk contribs‎ 8,399 bytes +82‎ →‎Git refuses to start a merge/pull
• curprev 21:1921:19, 2 March 2011‎ Marygoldman talk contribs‎ 8,317 bytes 0‎ →‎Git is unable to resolve a merge/pull
• curprev 21:1821:18, 2 March 2011‎ Marygoldman talk contribs‎ 8,317 bytes +89‎ →‎Git is unable to resolve a merge/pull
• curprev 21:1721:17, 2 March 2011‎ Marygoldman talk contribs‎ m 8,228 bytes −49‎ →‎Git refuses to start a merge/pull
• curprev 21:0621:06, 2 March 2011‎ Marygoldman talk contribs‎ 8,277 bytes −2‎ →‎git status
• curprev 21:0321:03, 2 March 2011‎ Marygoldman talk contribs‎ 8,279 bytes +1‎ →‎git reset
• curprev 21:0321:03, 2 March 2011‎ Marygoldman talk contribs‎ 8,278 bytes +1‎ →‎git reset
• curprev 21:0221:02, 2 March 2011‎ Marygoldman talk contribs‎ 8,277 bytes +86‎ →‎git reset
• curprev 20:5820:58, 2 March 2011‎ Marygoldman talk contribs‎ 8,191 bytes 0‎ →‎git reset
• curprev 20:5720:57, 2 March 2011‎ Marygoldman talk contribs‎ 8,191 bytes +273‎ →‎Great tools to help you resolve a merge conflict
• curprev 20:5020:50, 2 March 2011‎ Marygoldman talk contribs‎ 7,918 bytes −5‎ →‎Two ways git merge/git pull can fail
• curprev 19:5619:56, 2 March 2011‎ Marygoldman talk contribs‎ 7,923 bytes +7‎ →‎Two ways git merge/git pull can fail
• curprev 19:5519:55, 2 March 2011‎ Marygoldman talk contribs‎ 7,916 bytes +36‎ →‎Common questions
• curprev 19:2019:20, 2 March 2011‎ Vsmalladi talk contribs‎ 7,880 bytes +1,007‎ Added tool git diff
• curprev 18:5318:53, 2 March 2011‎ Vsmalladi talk contribs‎ 6,873 bytes +239‎ Added tool: git checkout
• curprev 18:4418:44, 2 March 2011‎ Vsmalladi talk contribs‎ 6,634 bytes +340‎ Adding reset as a tool
• curprev 01:2201:22, 2 March 2011‎ Marygoldman talk contribs‎ 6,294 bytes −1‎ →‎Git is unable to resolve a merge/pull
• curprev 01:2201:22, 2 March 2011‎ Marygoldman talk contribs‎ 6,295 bytes −1‎ →‎Git refuses to start a merge/pull
• curprev 01:2101:21, 2 March 2011‎ Marygoldman talk contribs‎ 6,296 bytes +229‎ →‎Tools to help you resolve a merge conflict
• curprev 01:1901:19, 2 March 2011‎ Marygoldman talk contribs‎ 6,067 bytes +1,322‎ →‎Common questions
• curprev 00:5100:51, 2 March 2011‎ Marygoldman talk contribs‎ 4,745 bytes +63‎ adding a common questions section
• curprev 00:4900:49, 2 March 2011‎ Marygoldman talk contribs‎ 4,682 bytes +59‎ →‎Two ways git merge/git pull can fail
• curprev 00:4900:49, 2 March 2011‎ Marygoldman talk contribs‎ 4,623 bytes +9‎ →‎Two ways git merge can fail
• curprev 00:4900:49, 2 March 2011‎ Marygoldman talk contribs‎ 4,614 bytes +558‎ →‎Why would my Merge Fail?

1 March 2011

• curprev 22:0522:05, 1 March 2011‎ Vsmalladi talk contribs‎ 4,056 bytes +714‎ Added section on how to identify merge conflicts
• curprev 21:5721:57, 1 March 2011‎ Vsmalladi talk contribs‎ m 3,342 bytes 0‎ No edit summary
• curprev 21:5521:55, 1 March 2011‎ Vsmalladi talk contribs‎ 3,342 bytes +1,155‎ Added tool explanation for stash
• curprev 20:2520:25, 1 March 2011‎ Vsmalladi talk contribs‎ 2,187 bytes +813‎ Added Tools: Git Status

• curprev 20:1220:12, 1 March 2011‎ Vsmalladi talk contribs‎ 1,374 bytes +1,374‎ Initial Page Setup