conflictPresentation1.md 437 Bytes
Newer Older
Daniel Duarte's avatar
Daniel Duarte committed
1
2
# Practical: Conflict resolution using kdiff3

Daniel Duarte's avatar
Daniel Duarte committed
3
4
5
6
7
8
* create a branch named changeMicheal and in the editor you change 
the content of `Michael.md`:
```bash
$ git checkout develop
$ git checkout -b changeMichael
```
9

Daniel Duarte's avatar
Daniel Duarte committed
10
Change Michael file...  
11

Daniel Duarte's avatar
Daniel Duarte committed
12
13
14
15
16
```bash
$ git fetch upstream
$ git checkout develop
$ git merge upstream/develop
```
Daniel Duarte's avatar
Daniel Duarte committed
17

Daniel Duarte's avatar
Daniel Duarte committed
18
19
20
21
22
23
24
25
26
27
summary:
michael.md on develop:
```
# Michael
```

michael.md on changeMichael (example)
```
## Michael Evans
```