Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Investigate merging all Brackets commits #245

Closed
14 tasks done
ficristo opened this issue Apr 11, 2021 · 1 comment
Closed
14 tasks done

Investigate merging all Brackets commits #245

ficristo opened this issue Apr 11, 2021 · 1 comment

Comments

@ficristo
Copy link
Member

ficristo commented Apr 11, 2021

Given the end of Brackets https://blog.brackets.io/brackets-eol-notice/ check if it is feasable to merge all commits back.

To avoid merging everything at once it is possibile to merge until a specific commit:
git merge <commit sha>

See progress: master...adobe:master

  • dabae57: Merge commit '4f0bab5fd27f9534c4089947b5dd2702ebb23e22'
  • b9350a4: Merge commit '3df39638a9f690eb4e3ec80df6c30ec6edb8bc58'
    I was expeting to merge 189f6d3 and 47a2a67 too.
    Not sure what happened...
    It seems they were merged on release branch, but not yet on master?
  • ca99684: Merge commit 'be2828227b2468d45c1e0ba8b75bb0ea3153a3c0'
  • 51d5c8f: Merge commit '8ecb5edba5e0f8044f5ac323878ca9f5917eb21b'
    File encoding\decoding is still not implemented
    (merged again in cf05188 because I was expecting a different result...)
  • 5e2da1c: Merge commit 'bc14a9e9a435c479e0d3373825b4c74287654115'
  • 1807b15: Merge commit '92819092bd54e78c397c5ca93b794a635fb50925'
  • 957647f: Merge commit '18dd43112e70acc351804127c8b9a0bebde72062'
    (Real merge in 7ef1fcf ...)
  • c887796: Merge commit 'b39e89a9c84c38878b0e7b5140f89e8cc56b953c'
  • afe68a9: Merge commit 'd52f3c9227e6955fc105c8c0b607f8acbc7479f0'
  • e884e58: Merge remote-tracking branch 'brackets/master' (adobe@d55ac60)

Some commit will require to implement some new shell things:

Things removed:

Regression fix:

Things postponed after the merge of all commit upstream:

@ficristo ficristo changed the title Invastigate merging all brackets commits Invastigate merging all Brackets commits Apr 11, 2021
@ficristo ficristo changed the title Invastigate merging all Brackets commits Investigate merging all Brackets commits Apr 21, 2021
@ficristo
Copy link
Member Author

In #257 I disabled more test.
But in general I think I merged everything back.

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

No branches or pull requests

1 participant