Team changes - #41

Open

RubenWillems wants to merge 24 commits into

CDuke:masterfrom

RubenWillems:TeamChanges

Commits on Apr 20, 2018

1) foresee TeamChangesetProvider : get all not yet merged changesets.
RubenWillems
committed
aa22aac
Initial split team and solo
DieterVantilt
committed
3a65834
reworked teamChangesetProvider : removed hard coded test settings
RubenWillems
committed
6adb43c
Merge conflict changes
DieterVantilt
committed
8893a44
Merge branch 'TeamChanges' of https://github.com/RubenWillems/AutoMerge into TeamChanges
DieterVantilt
committed
02f04db
Branch change set
DieterVantilt
committed
30da8ab
Choosing the source and target branch
DieterVantilt
committed
5f672fe

Commits on May 1, 2018

Implementation for the merging and adding all associated work items.
dieter-vantilt
committed
ab56d59

Commits on May 3, 2018

Commits on May 8, 2018

Commits on May 17, 2018

dummy values for testing (remove later on)
RubenWillems
committed
d15fc40
fix merge
RubenWillems
committed
610465c
Project source en target branches
dieter-vantilt
committed
5fc01da

Commits on May 18, 2018

resolve conflicts
RubenWillems
committed
016a3f2
Change to target branch
DieterVantilt
committed
5bdf8c0
clean up code
RubenWillems
committed
6b225fb
clean up code
RubenWillems
committed
c09eaa2

Commits on Jun 15, 2018

set .Net target framework back to 4.6.2
RubenWillems
committed
b4fa7a7

Commits on Jun 19, 2018

fix build ? removed newer C# syntax features
RubenWillems
committed
38e9251