-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Viktor Farcic
committed
Feb 11, 2020
1 parent
96916d1
commit c6b30eb
Showing
1 changed file
with
1 addition
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1 @@ | ||
## Replace master with orig | ||
|
||
```bash | ||
git checkout orig | ||
|
||
git merge -s ours master | ||
|
||
git checkout master | ||
|
||
git merge orig | ||
|
||
git push | ||
``` | ||
|
||
A silly change |