Skip to content
Varun Maitreya Eranki edited this page Apr 3, 2023 · 23 revisions

SQUIRREL - PG Subgroup Crawler

Welcome to the Wiki of our Subgroup. Here you should find all information about our project :)

Project members

Important links

  1. Google Drive
  1. Slack
  2. Taiga
  3. Kanboard
  • Click on the login with the gitlab account whenever you login.
  1. GIT

How to GIT-it?

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:

  1. In IntelliJ, switch your workspace/ checkout to F
  2. Commit Directory incl. PUSH in F
  3. pull A into F 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
  4. check, wheater all is still compiling/ working
  5. Commit Directory incl. PUSH in F
  6. In IntelliJ, switch your workspace/ checkout to A
  7. pull F into A
  8. Commit Directory incl. PUSH in A

looks like this in IntelliJ

Clone this wiki locally