Skip to content

Conversation

@Badrri-Narayanan
Copy link
Contributor

Description

Adds a test case for adding module location in JCT file manager.

Issues

contributing towards #219

Other stuff

more test cases on the way!

@codecov-commenter
Copy link

Codecov Report

Merging #270 (722fed6) into main (38069cf) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #270   +/-   ##
=======================================
  Coverage   71.17%   71.17%           
=======================================
  Files          74       74           
  Lines        2560     2560           
  Branches      238      238           
=======================================
  Hits         1822     1822           
  Misses        671      671           
  Partials       67       67           

@ascopes
Copy link
Owner

ascopes commented Jan 21, 2023

Hey, thanks for doing this!

Would you mind rebasing your copy of the repository onto main first and then repush this PR? All of those commits above that it shows have been added in this change we probably don't want to include again (as it will leave the history a bit of a mess).

image

What it is probably worth doing is updating your main branch to match my one, and then working on separate branches so that it is easy to keep main up to date in the future.

You should be able to update your main branch like so (might have to disable branch protections on your main branch in your repo settings if this gives a permissions error):

git fetch https://github.com/ascopes/java-compiler-testing main
git reset --hard FETCH_HEAD
git push -f origin main

Once you have done this, if you make a new branch from main:

git checkout -b task/file-manager-tests

You can then re-add your new commit individually (as the hash should still be in the git history on your machine, even though you overwrote the main branch in the previous step).

git cherry-pick 722fed627a04adaf8bc052032df1ddaaff15661c

From there, if you push the branch and make a new PR for this (git push origin @), it should then only have the one commit on it and it should be up-to-date with my copy :-)

If you keep your main branch as clear as possible of changes, GitHub should give you the option to sync it when it is out of date with the upstream (my copy). Will look something like this:

image

@Badrri-Narayanan
Copy link
Contributor Author

sure @ascopes . Thanks for letting me know

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants