*Pairing Session Details(22nd July)* I was getting few errors in my gerrit patch submitted sometime back(was showing "unable to merge"-Bug:63104).Learnt how to resolve conflict and how to integrate changes from master to branch using git rebase. Steps were as below:
- Checkout code from gerrit through git review -d Change Id - Do *git checkout new_branch* and *git rebase master* - If there is any conflicting file message then we need to resolve the conflict first manually and then add the file to staging. - Finally we can do git rebase --continue Learnt how to resolve conflict from RubyMine if we want to ignore our own changes and to keep the other's change.You can just do a right click on the conflicting file and under Git->choose "Accept Theirs " option - Through this IntelliJ IDEA will overwrite our changes. Learnt more about Continuous Integration and how we can see the screencasts for failing tests on Sauce Labs.This helps us in exploring the issue further. Learnt that whenever we commit code to Gerrit there are some jobs that run automatically to check code committed, for any syntax errors etc. Like the one: https://integration.wikimedia.org/ci/job/mwext-VisualEditor-lint/10646/console Hope this covers everything. Thanks Zeljko for your time.Looking forward to the next session. Kind Regards, Jagori
_______________________________________________ QA mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/qa
