-
Notifications
You must be signed in to change notification settings - Fork 2
/
file1.txt
24 lines (21 loc) · 672 Bytes
/
file1.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
First file to add.
changes for branch1.
changes 2 for branch1.
point of new branch. This will test out the rebase commands.
some more changes for the rebase test branch
makerdrone has just forked
some feature for a pull request
starting a branch that will be rebased,
and it should have conflicts
some work on branch-conflicts2;
some more work on the branch;
Verdict: the merging was not done properly
one more commit to distance ourselves from the last situation
point of new rebase-with-conflicts experiment
starting the experiment
working on it
more work
some more work
developing on master
dev work on master // yet again
last dev work on master