- gohwell parentPaid holiday for 1-3 years, what’s wrong with that?
- 5 points
- 3 points
- 219 points
- Answering my own question: https://raymii.org/s/blog/Vim_as_PID_1_Boot_to_Vim.html
- 2 points
- 2 points
- Alexa can give you an idea of the most popular sites. https://www.alexa.com/topsites
- 498 points
- 2 points
- 3 points
- 4 points
- 1 point
- 2 points
- Here's an example. It's meant to illustrate 2 developers working on a feature branch based on master and one pulls their code in before the other.
https://github.com/jparmstrong/gittest/pull/3/files
- Two feature branches were created based on master at the same time.
- Branch1: committed a change to readme and it's pulled into master via PR.
- Branch2: committed a change to readme, raised a pull request (PR#3), and the diff doesn't show the line that was added with the branch1 pull request.
In this example, the PR is telling me there's a conflict and I need to merge master with the PR branch (this is good). What it doesn't tell me is where the conflict is.
Solution, merge the base branch into the interim PR branch. The result will show you the conflict and properly represents what would happen if this PR is accepted. (Bitbucket does this)
Thanks for following up.
gist of merge master example output: https://gist.github.com/jparmstrong/07cab1a566c5c1495d7c8e07...