forked from dice-group/Squirrel
-
Notifications
You must be signed in to change notification settings - Fork 2
Home
Varun Maitreya Eranki edited this page Apr 3, 2023
·
23 revisions
Welcome to the Wiki of our Subgroup. Here you should find all information about our project :)
-
Philipp Heinisch
- project leader is away :\
- Varun Eranki
- E-Mail: varun.maitreya@gmail.com
- in Slack
- Waleed Bin Arshad
- E-Mail: waleedshah10@gmail.com
- in Slack
- Meher Vivek Dheram
- E-Mail: vivekdheram@gmail.com
- in Slack
- Philip Frerk
- in Slack
- Matthias Dürksen
- in Slack
- Abhishek hassan Chandrashekar
- E-Mail: abhishekhc1993@gmail.com
- in Slack
- Ajay Subramanya Kudli Prasanna Kumar
- E-Mail: ajay@campus.uni-paderborn.de
- in Slack
-
Michael Röder (Mentor)
- Tel: ???
- not in Slack
- Click on the login with the gitlab account whenever you login.
- GIT
- Michael's Repository
- our Repository
- external Repositories from us
Assume, you have your current feature branch F
(that was forked from the main branch A
[long ago]) and the main branch A
and you want to push your changes from the feature branch into the main branch A
:
- In IntelliJ, switch your workspace/ checkout to
F
-
Commit Directory
incl. PUSH inF
- pull
A
intoF
and resolve * MERGE*-conflicts, but ATTENTION: there is a bug in IntelliJ 2017.3.5: if you check the checkbox No commit, it commits, if you leave it unchecked, it doesn't commit - check, wheater all is still compiling/ working
-
Commit Directory
incl. PUSH inF
- In IntelliJ, switch your workspace/ checkout to
A
- pull
F
intoA
-
Commit Directory
incl. PUSH inA