Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
chhavip authored Dec 30, 2016
1 parent 1b5d727 commit f248e9e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Starting your own project with others? Learn about the [Basic Workflow](https://

* [Squashing Commits](#squashing-commits)

* [Avoiding Merge Commits](#avoiding-merge-commits)
* [Fixing PR when other changes get merged leading to conflicts](#avoiding-merge-commits)

* [Undoing Commits](#undoing-commits)

Expand Down Expand Up @@ -176,7 +176,7 @@ The above two instruction will locally squash the number of commits you chose to

This is a forced update that makes the remote repository squash the commits into one.

###Avoiding Merge Commits
###Fixing PR when other changes get merged before leading to conflicts
This is in continuation with requirement of having a single commit in your PR, suppose you did some work and submitted a PR to the main repository but before your request could be merged, changes were made by other developers in the repository and now your PR presents merge conflicts. You could fetch the work, resolve merge conflicts and push again but that will lead to `MERGE COMMIT` that is undesirable at times. The flow below can be followed to prevent the same:

This assumes the following:
Expand Down

0 comments on commit f248e9e

Please sign in to comment.