Happens when working on a team project when two/more developers have edited the same file.
Therefore, face the conflict courageously.
Assumption: current_branch(local branch) conflicts with a base branch called base-branch
git pull origin --rebase develop. If merge conflicts persist:current changes, incoming changes or Accept both changes
| # Last updated: 08/24/2916 | |
| # | |
| # Total instructions available: 18 | |
| # | |
| # https://docs.docker.com/engine/reference/builder/ | |
| # | |
| # You can use a .dockerignore file in the same context directory as | |
| # your Dockerfile to ignore files in the context before sending them | |
| # to the Docker daemon for building to speed up building. |
Happens when working on a team project when two/more developers have edited the same file.
Therefore, face the conflict courageously.
Assumption: current_branch(local branch) conflicts with a base branch called base-branch
git pull origin --rebase base-branch. If your local base-branch is upto date with origin, you can just do git rebase base-branch If merge conflicts persist:current changes, incoming changes or Accept both changes. Remember to cosult when fixing conflicts because you might end up removing crucial code.
When times get tough and people get nasty, you’ll need more than a killer smile. You’ll need a killer contract.
Used by 1000s of designers and developers Clarify what’s expected on both sides Helps build great relationships between you and your clients Plain and simple, no legal jargon Customisable to suit your business Used on countless web projects since 2008
…………………………