mainのRubyが3.2.3になったね
$ git merge --no-edit master
Auto-merging .ruby-version
CONFLICT (content): Merge conflict in .ruby-version
:
$ git checkout --ours .ruby-version
$ cat .ruby-version
3.3.0
mainのRubyが3.2.3になったね
$ git merge --no-edit master
Auto-merging .ruby-version
CONFLICT (content): Merge conflict in .ruby-version
:
$ git checkout --ours .ruby-version
$ cat .ruby-version
3.3.0
GNU social JP is a social network, courtesy of GNU social JP管理人. It runs on GNU social, version 2.0.2-dev, available under the GNU Affero General Public License.
All GNU social JP content and data are available under the Creative Commons Attribution 3.0 license.