131 conflict resolving #164

vaadin-miki · 2020-06-16T11:06:58Z

seems like #131 should be done, but it can only be tested by having its code in the development branch

…-conflict-resolving

sonarqubecloud · 2020-06-16T11:08:53Z

Kudos, SonarCloud Quality Gate passed!

No Coverage information
No Duplication information

vaadin-miki and others added 23 commits June 10, 2020 23:48

#131 now fetching before merging

d5ca5f9

Merge branch 'development' into 131-conflict-resolving

fd58269

#131 debugging

d9ae8f4

Merge remote-tracking branch 'origin/131-conflict-resolving' into 131…

05e234c

…-conflict-resolving

#131 remote, not remove, ffs

8e5a702

#131 syntax error when git fetch?

85cb0c4

#131 syntax error when git merge?

25a823b

#131 nope, no syntax error on merge

9e904d9

#131 trying with full checkout

64b1300

#131 now doing a separate checkout for master

32d30f9

#131 checkout triggered branch without cleaning

999f566

#131 moving on to git to checkout master

d114b34

#131 full fetch of branch on startup

f2f76d2

#131 passing user and email to config

89cc968

#131 added some debugging to git commands

640d7ca

#131 more debugging

01e2402

#131 more debugging (now fixed)

164101c

#131 merging without strategy and no commit

05bdc6f

#131 merging with strategy, auto-commit and push

8364e92

#131 release-notes.md now in a separate branch - testing

f026999

#131 fixing wrong step id

a73911a

(bot) release notes updated for 0.7.0

9272181

#131 should be ready now

d45f889

vaadin-miki self-assigned this Jun 16, 2020

vaadin-miki added this to the 0.7.0 - SuperTextField milestone Jun 16, 2020

vaadin-miki merged commit f9d1431 into development Jun 16, 2020

vaadin-miki deleted the 131-conflict-resolving branch June 16, 2020 11:09

Provide feedback